From: Raspbian automatic forward porter <root@raspbian.org>
Date: Sat, 3 Jun 2023 02:47:56 +0000 (+0100)
Subject: Merge version 29.0.6-26+rpi1 and 29.0.6-28 to produce 29.0.6-28+rpi1
X-Git-Tag: archive/raspbian/29.0.6-28+rpi1^0
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=8bd75e25c9312f78114035fb1e352e6e9a780dfc;p=android-platform-tools.git

Merge version 29.0.6-26+rpi1 and 29.0.6-28 to produce 29.0.6-28+rpi1
---

8bd75e25c9312f78114035fb1e352e6e9a780dfc
diff --cc debian/changelog
index 795fcaf9,c6844695..f63946c5
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,21 +1,28 @@@
- android-platform-tools (29.0.6-26+rpi1) bookworm-staging; urgency=medium
++android-platform-tools (29.0.6-28+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 29.0.6-6+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Tue, 22 Mar 2022 22:50:07 +0000]
 +  * Build with clang-11 to avoid armv7 contamination.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 02 Feb 2023 21:57:21 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 03 Jun 2023 02:47:56 +0000
++
+ android-platform-tools (29.0.6-28) unstable; urgency=medium
+ 
+   * Team upload.
+   * Added the missing Replaces field for android-libnativehelper
+     (Closes: #1034982)
+ 
+  -- Emmanuel Bourg <ebourg@apache.org>  Wed, 17 May 2023 09:45:36 +0200
+ 
+ android-platform-tools (29.0.6-27) unstable; urgency=medium
+ 
+   [ Chirayu Desai ]
+   * Remove Uploaders.
+ 
+   [ Roger Shimizu ]
+   * Resolve upgrade issue from bullseye to bookworm (Closes: #1034982).
+   * Add myself to Uploaders.
+ 
+  -- Roger Shimizu <rosh@debian.org>  Sat, 29 Apr 2023 23:55:31 -0700
  
  android-platform-tools (29.0.6-26) unstable; urgency=medium
  
diff --cc debian/control
index a4be7284,c0bacf63..ffa5c5af
--- a/debian/control
+++ b/debian/control
@@@ -2,10 -2,10 +2,11 @@@ Source: android-platform-tool
  Section: devel
  Priority: optional
  Maintainer: Android Tools Maintainers <android-tools-devel@lists.alioth.debian.org>
- Uploaders: Chirayu Desai <chirayudesai1@gmail.com>
+ Uploaders:
+  Roger Shimizu <rosh@debian.org>,
  Build-Depends:
   bash-completion,
 + clang-11 [amd64 i386 armel armhf arm64 mipsel mips64el ppc64el s390x powerpc ppc64 sparc64 riscv64],
   debhelper-compat (= 13),
   dh-exec,
  Build-Depends-Arch: